From 35756b38644511ec02ffa10ab482204a38215733 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Jun 2006 02:32:16 +0000 Subject: [PATCH] store scale in percent --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkprintoperation-win32.c | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c49d33b8bf..894a62adf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-11 Matthias Clasen + * gtk/gtkprintoperation-win32.c: Store scale as a percentage. + (#344560, Christian Persch) + * gtk/gtkprogressbar.h: Add a dirty flag to GtkProgressBar.n/ * gtk/gtkprogressbar.c: Defer updating of the offscreen pixmap until expose. (#344543, Chris Wilson) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c49d33b8bf..894a62adf5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-06-11 Matthias Clasen + * gtk/gtkprintoperation-win32.c: Store scale as a percentage. + (#344560, Christian Persch) + * gtk/gtkprogressbar.h: Add a dirty flag to GtkProgressBar.n/ * gtk/gtkprogressbar.c: Defer updating of the offscreen pixmap until expose. (#344543, Chris Wilson) diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index 8184846604..f47f763dc6 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -677,8 +677,7 @@ devmode_to_settings (GtkPrintSettings *settings, } if (devmode->dmFields & DM_SCALE) - gtk_print_settings_set_scale (settings, - devmode->dmScale / 100.0); + gtk_print_settings_set_scale (settings, devmode->dmScale); if (devmode->dmFields & DM_COPIES) gtk_print_settings_set_n_copies (settings, @@ -959,7 +958,7 @@ devmode_from_settings (GtkPrintSettings *settings, if (gtk_print_settings_has_key (settings, GTK_PRINT_SETTINGS_SCALE)) { devmode->dmFields |= DM_SCALE; - devmode->dmScale = gtk_print_settings_get_scale (settings) * 100; + devmode->dmScale = gtk_print_settings_get_scale (settings); } if (gtk_print_settings_has_key (settings, GTK_PRINT_SETTINGS_N_COPIES)) -- 2.30.2